fd72e4294cce2dabf51f37a02072e7ca49404eaf,maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java,EjbMojo,execute,#PluginExecutionRequest#PluginExecutionResponse#,117
Before Change
//
// ----------------------------------------------------------------------
File basedir = new File( (String) request.getParameter( "basedir" ) );
String outputDirectory = (String) request.getParameter( "outputDirectory" );
String jarName = (String) request.getParameter( "jarName" );
boolean generateClient = new Boolean( (String) request.getParameter( "generateClient" ) ).booleanValue();
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
getLog().info( "Building ejb " + jarName );
File jarFile = new File( basedir, jarName + ".jar" );
MavenArchiver archiver = new MavenArchiver();
archiver.setOutputFile( jarFile );
String ejbJarXmlFile = "META-INF/ejb-jar.xml";
archiver.getArchiver().addDirectory( new File( outputDirectory ), new String[] { "**/**" },
new String[] { ejbJarXmlFile, "**/package.html" } );
archiver.getArchiver().addFile( new File( outputDirectory, ejbJarXmlFile ), ejbJarXmlFile );
// create archive
archiver.createArchive( request );
if ( generateClient )
{
getLog().info( "Building ejb client " + jarName + "-client" );
File clientJarFile = new File( basedir, jarName + "-client.jar" );
MavenArchiver clientArchiver = new MavenArchiver();
clientArchiver.setOutputFile( jarFile );
clientArchiver.getArchiver().addDirectory(
new File( outputDirectory ),
new String[] { "**/**" },
new String[] {
"**/*Bean.class",
"**/*CMP.class",
"**/*Session.class",
"**/package.html" } );
// create archive
clientArchiver.createArchive( request );
}
}
}
After Change
try
{
archiver.getArchiver().addDirectory( new File( outputDirectory ), DEFAULT_INCLUDES,
new String[]{ejbJarXmlFile, "**/package.html"} );
archiver.getArchiver().addFile( new File( outputDirectory, ejbJarXmlFile ), ejbJarXmlFile );
// create archive
Manifest configuredManifest = archiver.getManifest( project, mainClass, packageName,
convertBoolean( addClasspath ),
convertBoolean( addExtensions ) );
archiver.createArchive( project, manifest, convertBoolean( compress ), convertBoolean( index ),
configuredManifest );
if ( convertBoolean( generateClient ) )
{
getLog().info( "Building ejb client " + jarName + "-client" );
File clientJarFile = new File( basedir, jarName + "-client.jar" );
MavenArchiver clientArchiver = new MavenArchiver();
clientArchiver.setOutputFile( clientJarFile );
clientArchiver.getArchiver().addDirectory( new File( outputDirectory ), DEFAULT_INCLUDES,
DEFAULT_EXCLUDES );
// create archive
configuredManifest =
clientArchiver.getManifest( project, mainClass, packageName, convertBoolean( addClasspath ),
convertBoolean( addExtensions ) );
clientArchiver.createArchive( project, manifest, convertBoolean( compress ), convertBoolean( index ),
configuredManifest );
}
}
catch ( Exception e )